Amended code style