Removed trailing whitespaces
moved vars to head