Cleaned up code warnings