Fixed today's dabbling

Cleaned up as much of the code as I felt was immediately necessary.