Move include from header to implementation file
Remove some unnecessary temp variables.