Cleaned up the code, made profile classes