Code cleanup
Updated to version 1.8