Clean code, improbprove design and layout