fixed some indentation, small tweaks