reindented stuff to my liking