Removed needless code
Using correct type