Contract Cleanup

- Cleaning some various contract complaints from the IDE.