cleaned up modules
general cleanup