logo! + some cleanup