minor fix
Only minor fixes & refactorings