Cleanup

#2 
@Sorunome Please review before I we merge.