added whitespace and tweaks variables