improve readability & code quality