Standardise constructors
Whitespace
Made method static