BlueJ stuff and cleaning up indents

woo
ignoring junk