Fixed code styling issues for merging