trailing whitespaces
got rid of -Wshadow compiler warnings