Removed testing code, added constants