Cleaned up generic module

Minor housekeeping had to be done.