Removed some old code and fixed indentation