Fix synchronized block and added a Constants interface
Sync block
Consolidated Helper Methods
Cleaned up code