fixed indentations and stuff