Bringing the classes into alignment, fixed a few formatting issues and
simplified the logic statemtns
Refactored the BuildActivity class