RFC 1855 70 chars
Code refactoring