uppercase constants
consistent var names
cleanup