Updated comments and improved styles