Reidented all with tabs + spaces and moved initializacion of private atttibutes to the constructor