conventioning patch 3

wtf happened