Bug fix due to not making deep copies.
Constants removed and initialize method refactored.