Removed extraneous variables