Better naming conventions, remove context