Remove useless params
Whitespaces
Fetch options from ENV later