Added includes call & small code style change

#125