better naming convention and organisation