Cleaned up a little bit of code. Removed all warnings