Code clean up...