Some restyling
Remove log function