More code cleaned