Changed syntax to better unify code