Little fixes, refactor..