Added constructors and removed unnecessary semi-columns