V 1.6

More Code Cleanup