Cleanup

removed useless variable and decreased line count