Performing actions in better way.
Small code and style improvements.