changed some syntax for readability