Cleaned up code
Added build tools