Removed more redundencies