Cleaning up the code... again