Fixed CS and improved code readability

- Fixed CS
- Improved code readability