added redundant pieces of code
fixed tab spacing