Fix some code beauty concerns