- changed order of statement and added whitespaces