first iteration of uniform code-styling