cleaned up code a bit
Merge pull request #30 from phoebebscott/cleanup

cleaned up code a bit