merge branch; delete useless unnamed variables
move constants to respective file