cleanup changes

#1