Fix minor style issues

[e25384779302fa6bff20be215eac19b6e128f424]
Remove Parse dependency

[ee60c3323a2f9041fb07a5dfaf2a3ea268fd108d]