1.6.0: Cleaned up the code