Added settings for snapshot / release deployment and did some code cleanup and formatting