Some cleanup && better routes