Code cleanup (Phase IV)
Code cleanup (Part V)