Some small code cleanup
Some preparation for server tab interaction