Cleaned up functions and startup files.