Minor code standards enforncement