Improved styling

- Removed comments
- Moved vars in the test function