Cleaning code, better font legibility and other minor stuff