removed swap and cleaned the extra spaces