Code cleanup, initial Hello world working