Cleaned up code a bit by removing extraneous options