Code clean up
Binary files for 1.2.3