Code format and cleanup