Code style fixes and remove trivial algo