Cleaned up the code for 1.5 release