Some comments and minor styling