Improved method name, added some integration tests and did some boyscouting