refactor code as includes, new post