minor changes to code, shoudln't affect functionality