Fixed naming convenstion, added documentation