Define dependencies
Fix code style issues