Cleaned up code and suppressed warnings
Also FrankerZ