- clean code updates