Refactor code, simplified .build function, Updated Readme.md