Cleaned even more code