Converted the immutable vectors to static functions
- Fixed formatting