code fixes, better conventions
final changes