Removed superflous code and fixed indentation