Little improvements to code, nothing important