A bit of refactoring to make a code a lil more readable
Updating build artifacts