some minor changes in spec and indentation(sublime to vim format issue) etc