updated with editor shorthand
code cleanup