Got rid of all warnings
Cleaned up all warnings