Updating build file, code cleanup.