Implemented stylistic changes as asked