Cleaned up comments and warning messages