Code cleaning — shortened naming