cleaning up repository, fixed template loading context issue
cleanup