Cleanup. Fixed #38