Simplified variables & whitespace