- Cleaned up code and removed some of the compiler warnings.