Cleaned up code, added action verbals, etc