Cleaned up for merge

#111