Minor src cleanup