Revert "change code to follow conventions"

This reverts commit 13918ddbc61ab0b891d6507320d6e94821b96cd1.