Bump version 3.2 -> 3.3
Move parts in mode init function to their own functions