Cleaned some code and added swag logos!