Made initial code clean