cleaned up code and modularized personality