fixing spaces and removing unused var