My actions and code improvements