Organize code.

Also made names uppercase to follow Day One.

Follows style of Day One.