removed tabs and improved indentings