increased var usage for local variables
added enum extension class