code fixes, better conventions