cleanup/coding standards

- Minor cleanup operations
- Refactored code to match coding standards