Less casts + change some local variables