Cleaned project to make it work on different computers