Cleaned up
Working on #17