More cleanup of the code part