Again: Cleaned code.