Added a buildfile_path and some minor code review changes