Clean up and code style

- Follow the coding guidelines and use the Coder module to verify your code.
- Never ever use tabs for indenting; change your editor settings accordingly.
- Remove unused functions before commit it: d($var)