fixing few best practices issues (refs: #318)