Build

cleanup and white space management