Wrong return value
Redo code styling