Code improvements (Clean code).