changed order of methods and variables to match with common style