Clean code style and naming