added constants and fixed naming convention