Version 2

*style work