cleaned up code, added font