Cleaned up tons, made place for getters and setters, made it more error prone