1. Code clean up