Updated to new git style & removed redundent build() function