Removing obslete lines and indentation fixes