removing commented out code
modularizing biomorphs and general cleanup