Fixed building Splasher
Code cleanup