Apply a large dose of KNF.
Another large dose of KNF.
remove silly cast
KNF and some code cleaning.