replaced hardcoded values into enum, renamed unsuitable methods