Minor code refactoring
Starting to test the app