Additional code checks
Applied new code styling