Added build-file
Cleaned up code