Little bit of a rework for the entry point. More concise, added comments