Style, comments, small improvements

an :)