rm obsolete code; correct declare->define; rm 1-liner-braces; rm unnecessary else statements; precision hardcoded; static methods