Slight route changes and redundant code removal