Unnecessary variables; naming