Code Cleanup

- Unannounced Update
- Code cleanup