Sugested inprovements

Some observations to the code.