Added comments and fixed more spacing issues