Code Conventions

Just Ajusting some conventions :accept: