Some cosmetic changes... Deleted a few unused lines of code