cleaning up some of the ugly in brandon's code
remove more extra lines