cleaned up code and transitions