Modified several method implementations, changed some methods to static