Code improvements
Last code improvements :)
damn