Code Consistency... :snail::tiger2: