colorbar hack now a bit less hacky
minor cleanup change