Cleaned up variables, added more verbs