Removed constructor-like functions and fixed formatting