Eliminated un-necessary lines of code