Cleaned up and improved build