Fix: Codereview issues
Resolved: Set javascript to constants class, Code refactor