Cleaned more codes