Use basic dependency injection syntax

#34