Cleaned
Added parameters & vars