Cleaned up several scripts

- Normalized code style
- Removed redundant comments and old, commented code