Comments add and style cleaned up