Begin code cleaning