Updated buildscript and code clean up