Just some code improvements