Improved build script and added clean task