Compacted and cleaned

Compacted syntax, removed unnecessary decimals, removed unnecessary
import