Minor changes II

Added comments and code formatting according to style cop