tidy up code and added logo