cleaned the whole shebang a bit