Removed extra lines and code