Code cleanup and logo