added slogan functionality and did some code refactoring