Code style fixes and update to solution