Code improvments for proper naming