Cleaned-up some codes.