Cleaned up really poor coding decisions