Incorporating proper logging and best practices