Cleaning up for version 4.0~! :D