Code clean up / check