small modif to better fit coding standards, and security improvement (security check on controller load)