* Code clean up