Added monk, Cleaned up a little code