Simplified code base

Now it's easier to find next/previous page :)